Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 Nov 2011 07:15:56 +0000 (23:15 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 Nov 2011 07:15:56 +0000 (23:15 -0800)

Trivial merge